Fix temporary issue #12