small change ... in order to get changed signal correct, move DEFAULT section test upward.