Fix #557