fix handle condition
working or