Fix to chiliproject issue 908