handler fix to previous commit