One last bug catch