Fixing copy/paste bug