Fix to stack parser