Fix Runtime Error r6025

Fix Runtime Error r6025