FIx #33 and #12