Fix Lithium issue