#628 fixed