fix #503 BUG