Fix problem when there's not current_store