forgot to remove when-not