Fixed variety of bugs