Fix for #158