isNaN fix, glass storage space fix