bugfix and error suppression