Fixed mis-merge