Workaround for remote validation