minor bugfix: loading order for some files