Added bugfix for previous build