Fix hawtio issue #537