Valama: Fixed instability caused by last commit