improved bugfix