Revert "Revert "QuickFix""

This reverts commit 521afd0d7cd822f8f7fd02815d348a8a65ba5573.