Fix #1536