Fixed 26/27 errors