Implemented fix for FEATURE D.