Added a TODO note to implement issue #35