Issue #1: Fix issue with missing destination file (squash me)