Fix for issue #1599 (OH1.6)