still fixing bug