Additional Fix #245: Eliminate run-time error