Bug fixed. Added extra checking por the data comment.