Bug fix the bug fix to bug fix