Tempororary fix for #7
Build d340c026