Bug fix (I hope)