ZP-1161 update to solve comments from sk. Released under the Affero GNU General Public License (AGPL) version 3.