Fix #267 for 2.2.3 as well