Finally fixed build tool