keep_only bugfix