fix #603