Fix #1019