color fix
handler fix