Fix custom commands