Fix spinner event issue from #67