Fix #162: Need definition for 5.4.22 (and #160 as well)

Fix #162: Need definition for 5.4.22 (and #160 as well)