bugfix, design