Fixed #216