Ref #106 - Last try to fix the failing test