Fixed bug in experimental mode