Fixed #2151 for 1.3.1