Fix for XD-486.