temp fix to avoid infinite loop