Incorporate bobthecow's suggestion

This doesn't seem to resolve the problem, though...