seems to be a working hack for issue #10