Make check transform step Option => Option, close #1027