Added fix for keywords that appear after the beginning of the line