fix kirby issue #31