Fix ArrayIndexOutOfBoundsException
Further fix for pre-1.6.2 compatibility
Update version number to 2.5.4