Fixed #3, #12