Fixes Basic Demo