#535 fixed