Important fix
Merged branch