fixed commandhandlers