Fixed merge error

See 00ffe72944e004e1dbbbad43fe644b733053d4a9