Fixed for enviroments w/o krimsale