rebuild after merging #120