Fix mapping option, close #10