finally fixing #12.