decode more / fix for #117