Workaround for endless loop