Fix. Bad merge.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #1091 from kwilczynski/master

Fix. Bad merge.