v0.8.9 - sorry - fixing the logic, this time for real