Found cleaner way to fix 'access request too early' bug, which better allows for testing.