#69 Runtime error fix