Fix this to work more reliably