Fix for Android comp lists.