Fix for demo purpose