Rename method and call it to reduce duplication (thx @macbre)