Complete fix for #106 (2)