Fix #93; fix build error