Fix #1279