Decode fix for #3