DSD component ordering fix