Fix #600