fix #484