Resources in JB workaround refactored