#36 fix of the fix (still workaround)