Fixed sample module, losing context