quick fix of serious infinite loop