Fix #1016