Fixing the hearting functionality