Modified safe analysis to properly path the result