Another fix for the missing heart hack

Hopefully I'm now covering all cases!!! Still needs some tests.