Should fix #492, removing the double copy