Another try to get correct build results

Signed-off-by: Andreas Pieber <anpieber@gmail.com>