craziness fixed
 merged