Implement command fit
Fix defect