removed all workarounds