removed null issue