avoid fatality
minor enhances