Final fix...i hope