Trying to fix Lucas' bug 2