Small bug fix
Merge branch 'xcolab_refactoring' of https://github.com/jintrone/XCoLab into xcolab_refactoring