Server-side Patch

Fixed issues with Async (reverted)