Gelato Form - W3 Fixes #189