previous fix wasn't enough, this should make things work more reliably