FIX issue #641 

Resolution is mainly coming from commit https://github.com/avocode/FormExtensions/commit/be706a677937776b7acfb08e3780a312b5b0b761