Made step finder regex more robust