Fixed the buggy