Added checking for pass attacks