Fixing problem on the last build