fixed some cases