Resource system fix