Finished Fixing #70