Fix #3 (untested)