Chimney pattern fix, tackling issue #73