Fix dye stuff, fixes #23