Add workaround for Forms