PIVOT-898 and PIVOT-901, a fix to solve both cases (and without add a new style)

git-svn-id: https://svn.apache.org/repos/asf/pivot/branches/2.0.x@1455508 13f79535-47bb-0310-9956-ffa450edef68