FIX: Fix for 2.6?