bugfix and new deleting