#658 fixed