fix #653