BUGFIX https://sdlc.certivox.com/browse/MIRACL-5