adding workaroun to avoid nullpointer