baby bug fix - location stuff