Fix #12, #13