Fixing server response