Fixed build procedure