fixed for new resource implementations