Refactor made an error which caused it to fail. Fix'ed