online \ offline bugfix