Fix for HD-423