Make sure this doesn't get broken with the latest JS