Bug fix for disappearing data.