I wonder if this fixes the problem @ivanov is having in his tutorial branch.