Fixed a bug(s)