Fixing bugs: after space everything was removed