Added more quotes and fix bug pick up version for de header