Seems to work in all cases now.