issue528 fix?