Jay, another bugfix