Fix ambiguous step problem