Fixing 1.9 compatibility