Fix concept is null bug