Sloppy fix for issue #9