fixed issue #26, filter based on timming