Try to fix neverending loop