- Fixed load bug reported by Tom