Fix loading behaviour