fixed #60 + rocket for client