fix regarding ticket: https://rt.egi.eu/rt/Ticket/Display.html?id=5268