Fix #11 and #12