A hackish way to get things working. See #82 (untested)