Use more accessible type and remove assert

Use more accessible type and remove assert #928