Bugfix and sample data