fixed "loading" behaviour