Fix #169 support for multiple filetypes