Another fix with warper