Fix #567