had the exact feeling about this but i was not sure how the fix the issue without a complete rewrite of how the store stuff works...