fixed to be compatible with livia-client