Store Limit Bug Fix