don't get destroyed by race condition
Merge branch 'master' of github.com:Fortisque/anappleaday