some issues to be fixed