Resolution Handling Bug Fix