possible fixes, requires testing