fixed initial load issues with store/scope