Fixing potential resolving issues on slow machines