fix decode and add custom command