Fixed issue on client