Re #1361 - Fixed 10000% bug