fix for when suppliying $from location