Including the bug for location zip