Fixed issue #1696 and Blueprints commit f50a26286c4c883e369c12c3b25a299d5a8d110f