Fix #274

Fixed here and in the analysis object.