Merge branch 'issue-827'
possible fix for 1835

Signed-off-by: Sven Strickroth <email@cs-ware.de>