commented out bug-fix code