Bugfixes : Fixed some bug regarding the previous commit