Maybe this works now? #42