Reply with reference so that the client can store it ASAP

ok. please check the pr :D