Removed 'Stack level too deep bug'