Fix #12 for 2.1.4