fixing cross-device installation errors reported in issue #19