Try to improve build