prevent race conditions in development

fixes #19