Revert 801cb60..3e0d3f9

This rolls back to commit 801cb60924c231b5517558af5a47cc899c16570f.
Reapplying filename check

Rolled back to 0.2.1 and reapplied this fix