Fixed the broken thigns