Fixed #195