#FEC-2453 #comment added helper methods