Hopefully ultimate fix to initial pop detection