fix to unrealize handler