Added filter to fix #114