accept Jserv's patch

Signed-off-by: Mikimoto <mikimoto.c@gmail.com>