- fixed material form bugs, again