Fixed bug in currentPlaceOrInCurrentPlace