Following @houndci comments