Fixing issue https://github.com/sonata-project/sandbox/issues/81