Temporary NPE Fix