Fix #656 for 2.4 as well