this might fix NPEs