bug fix. update with friends' advices