Fix calling from back-end and with multiple files