Added safety to fir