Issue #276 Fixing TODO