Fixed issue # 11