Fix for #363

I fixed the #363 issue and built on forge 1232.