~ fixed bug
 merged