temp test logic
fix nullref