Bugfix, more samples