Fixed the bugfix