Fix #67 (untested)