Fixing hyper-irritating "heart" action