Reduce two steps to one