Fix for wmsStores - remember to do a pull-request for this