removed the ugly workaround and made it working as usual