ToDo task for GCI and a simple bug fix