quick fix to avoid NPE