Added TODO #306