Additional fix for enhancement #5