Fixed buggybuggybuggy code