fixed at command
Merge branch 'fixingAtCommandTime'