Fixed #433, #12, #434