Restoring stable after  #147