Demo project fix