removed temporary workaround for issue #3