Fixed handling of Namespace in FXDemo