Finally fixed build