New design fix: resolve issue #46