1.1.2 - more robust parsing