fix to fix the broken fix (from last commit)