isn't this something we should handle in the forms?