added a "return" to onCommand