Fix/form advanced use

This is a fix for #630