Bugfix SNOWDROP-63 by Vaclav Dedik