More bug hunting...