Fixed: last comments bugs