FORM post fix for builds 38+, backwards compatible with build 35