Fix #563