solving some issues