Hot fixed for client usage