Fix for issue #1485

Fix for issue #1485