command builder fixed