updates to fix and close No. 36