Fixed bug in PublicHandlers