Fixing copy/paste issue