Fixes issue #1 for the vhdl generation. Still need a fix for the systemverilog generation.