Fixed Long issue