Add comment to uncomment the code after 0.9.5