Re-implement commands now we found the bug.