removed p:choose that did nothing