Fix a small issue with draw order vs select order