Addresses #433

Changes as agreed in #433 which has been open since December, but even so, please check before merging!