multiple fixes, still broken