fixed to work when places are not supported