Fixed an issue with register resolution