Fixed an issue

but there is still another issue