better handling and bugfix