This should fix #48 - More work to be done for filters.