added TODO for bugfix