should remove undefined issue