Fixed the badness