Add better handler for mixer
merged