Fixing emiters bugs