fixed some bugs on load/store