Fix bag with null current_location