Fix/voms 516

https://issues.infn.it/jira/browse/VOMS-516