fixed #498  added autodie feature flag