Fixing shutdown issue with parcel layer