Fix for broken test between 2.1 and 2.4