Fixed usage of interfaces and jumpFix method (hopefully)