Hotfix better comments