Fixing for 1.4.6