Fix #603