Added fix for honor_changed