Add TODO marker to not forget to remove workaround