#17 Bugfix final attempt to workaround the bug