faster loading, bug fix