working on bug MEN-32, issue resolved