One more fix wrt #30
Merge branch '2.4'
Fix #31