Horrible bug fixed.
Merge pull request #778 from vi4m/fixes_wojteks_knowledge

Horrible bug fixed.