bug fix for 1919, 1964
Merge branch 'bugfix' into dev