Fix for bug in bugfix for other bug.