fix #604

This is not perfect, but will do until the back-end is re-vamped
Merge remote-tracking branch 'origin/master' into 1.4.6