Build: #664 failed Changes by Sam <samuel.vonstachelski@fhnw.ch>