Fixed and oops bug