Pratially fix for Clutter>1.12