Fixed issue with 40* errors