Fix issue in 2.3

Please double check this before merging as it's done from memory fixing this issue elsewhere, and I don't have this package set up for testing myself.