Be more standard-friendly