Fixed bug in release 1.0