Temporary fix for demo