[fix] bugfixes