issue432 possible fix