Fixed properly resolving package based on operation