General bugfixing
Fixing merge conflict