Use workaround to get tutorial working. Fixes #19