Fixing https://github.com/xmetdb/xmetdb-server/issues/22