fixing issue # 320