added failsafe location