Oop fix components context
0.1.1