Improvement of implementation of XOSP by not returning an empty list of elements.