working on issue MEN-38