Fixed for Languages 1.2 compatibility
Release 2.5