Better decode handling.