Fix for nil location