Fix #1455