Fix for adding comments to tasks

Change-Id: Ibcab5e9f6312abbaa87763425a5e04b7c503e999