fixed implementation related with MARMOTTA-249