Partial fix for issue #24 - TD2