Fixed, and tested on current demo box.