Version 1.2.10 Issue #120