[development] Bugfixing