Fixing BuildStore