fixes requared from pablo