temporary fix for null pointer exception while we work on a full solution