Simplify this step to make it more reliable