Fixed for newer systems