Bug fix from 2.8.0, demo update

Version 2.8.1