Changed possible bugs