Runtime error fix