Added workaround for issue #113