Quick fix for demo