Fix for parsing of first step