Fix issue with returning punts