Fixing 5.5 compatibility