Fixed issues where context was missing.
Version 2.3.1