One last bugfix