Fix for demo code...