bug fixes on same changes