Fix for Issue #1103 #1104 #1105

Fix for Issue #1103 #1104 #1105