- [fixed] problems after last merge