Enable command exception fix