Fix #36 for 2.2.4 (assuming it completely resolves the prob)