Fix issue #1789

Signed-off-by: Andrey Andreev <narf@bofh.bg>
17 files changed