Fixing final bug for the night