BUG fixed (data buffer obsolete)