merge fix # 500