Bug fix (untested)