Changes required to close issues #721, 1271, 1271
Changes required to close issues #721, 1271, 1271