Added bugfix for previous build #2