Fix #1337