fix for issue #1488