Fix for 1.2.10