Revert "Little bug fix"

This reverts commit cc6c8ec14e086f3dcb562feb83f1f7804506faaf.
Revert "Revert "Little bug fix""

This reverts commit bb5cc9419579118abd23ff8a82f6d67f50f64fc0.