Fixed a bug where only the last before filter would be called