Quick fix for store_location oddity