Fix for enhancement 49