Remove part causing "too much recursion" error
Merge pull request #60 from charlotte-raillere/Issue_TMART_198

Fix for TMART-198