Fix for issue # 75