Fix #559