fixed possbile content loop