remove a workaround and actually fix the bug