Tempory fix of build methods by adding returns.