+ Fixed issue with wrong working directory