#35 reduce bugs