Fix for chaos endless loop bug & static star tp