index fixes maybe?