bug 1137: Added new restrictions to the checks