Fixed the last bugfix