#85 more bug hunting