should fix #17 (untested)