Applied fix proposed for https://bugs.freedesktop.org/show_bug.cgi?id=63755