fixing behavior
fixing behavior