Contrib to #158