Fixed: possible endless loop