Bug with context is fixed (I hope)