fix https://github.com/whalepath/whalepath-server/issues/484