bugfixing ._.