Fix parser for correct shapes