Bugfix sample branch