added version condition to remove annoying loading msg