Fixed an issue with resolve