UPD: #1225 for DictionaryModule + small fix PSR