Fix for XD-509