Fixing issue #58, but introducing a bug in filtering