Fixed #170