Fix for double-click NPE?