fixed an issues