Fix #1048