Change resolution to be short circuiting.