Fixed primitive parsing. Added double check for modifiers