bugfix + reliability