Bug fix: Relapse of issue #265