Fix #14 for 2.1.5