Small change to avoid NPE