submitting potential fix for issue 488