#55 Fix status loop