Use @bitprophet's fix for issue-less entries