Hopefully final fix for alfresco...