Make parsing more strict