Fix #1003