Patch Leaky Connections with AOP