fixed for DEMO mode