master: Fixed bug with this context