Fixed copy/paste issue