Fixed Set(...) deprecation warning