#778 fix a crash
#778 modify the location string