fixes for extract