Fix for #141 (x4)