feature #589