added workarounds