Issue #156 #157

Fix for Issue #156 #157