Hack for issue #4