Fix for potential issues (or impossible, dunno...)