hot fix on loading problem