more possible fixes