Modification to overcome the issue with iframe-plus
see internal UNIGE ticket: #790