Fixed 3.1 compatibility