Feature/fix by sergio g