Public form fix