Fix #1190; Fix #1216