Solution for issue #1668