FS-6095 --resolve modified to protect against memory leak and make it more consistant with other modules
