fixed some bugs related to @include and @extend