Fixed never-ending bug loop (msut rewrite)