Modified previous patch to match the comment on it