Fixed command handler AGAIN!