Fix #198 and Fix #195