Found a workaround for issue #44