#80 normalizing build