Fixed empty spaces