fix both cases
+comment