* Fixed issue coming from last merge.