possible fixes, too lazy to properly test