Fix #581