Fixed custom commands