Fixed loading toggle double firing (hack)