This rework/fix is so good it almost looks fake