Fix #55 for 2.1.4 as well