Fixed basic tutorial

Not to be ported to stable as tutorials are deployed externally
Fixes #606