Guard fix