Update from cloud9
Fix weird lakrizz insertion