Fixed some bug @ 2016