fixed issue null returned