optimize: bugfix