Discussed Hotfix

For your review.