made things consistent to avoid breakage