First commit in new year, fix the bug made in previous version