possible bugfix + additions