Fixed #628 (now complete fix)