Fixed and enabled error detection