#617
Quick fix during the generation