Pre mvp bugfixing