Might fix a NPE.........