Fixed Long/Integer problem