more strict version. fix for remove