Fix #64 for 2.1.5