Fixed #948