Testing a possible solution for the production environment, related with
issue #389