Fix for multiple displays

Not tested