Little stability improvement and bugfix