Fixed some busg