Fix resource unwrapper