Fix #130 for 2.1.4