Fixed the rest of that bug