Bug fix for 242187c