#643 fixed