Fixed the bugfixes