Fix for #56. Updated scraps