Fixed ambigious step match of core steps