Fix #17 for 2.2.3 as well