Fix #45 for 2.1.3 as well