Fixed bug with merlin.

Change-Id: I1bb6a3e55db8cf4cce82ab500a0ed73430ffaffa