Work around (45/46)

Work around