added workaround for issue #18