bug fixxezz
merging