FIX: #5847 (tracker)