fixed extending issue