Fixed the f***ing bug