Bug fix: and safed some space