LPS-39616 Fix location