Attempt to preserve type in commands