Fixed Issues Number 512