issue #708 mini fix
Merge branch '708' into hotfixes