Fix PR1005