1.6 merlin

Fixed