Fix draw disciplines