revert some failed attempts
new fix attempt