Preparing 2.0.1 (fix exception)