Prototype fix for #136