Improve space support to avoid errors
0.0.2