Work around (19/46)

Work around