Issue #11 hack