Fix for issue # 25

Fix for issue # 25