FIX: workaround for deletion