Replacing space according to issue #1