Partially fixes bug 44. (cherry picked from commit 7574cacbd5) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7574cacbd5