Fixed bug... sort of