fixing issue # 241