Fix #166 for 2.1.4