Fix #38 in master (2.4)
...