Fix #211 by adding a bit more clarity on the context variable handling