Is this still needed given that your not using `parse`?