Fix #569