Bug fix all over again