Fixed error, passing tests