Address @ authmillenon's comment