Fix initial pop in FF

Should fix #269.