some fixes and workarounds
v1.5.3