Fix #1 and change the sample a bit