workaround for issue #21