Fixed contextiso bugs