Fixes resolving