Now both parts of the spaces problem is fixed