fix other part of bug