Fixed crappy code